Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gateway #2084

Merged
merged 66 commits into from
Mar 8, 2024
Merged

gateway #2084

merged 66 commits into from
Mar 8, 2024

Conversation

chr-stian
Copy link
Contributor

tests have been updated so that they all use galaxykit and can authenticate with the gateway

@jctanner
Copy link
Collaborator

This is fine, but the integration tests need to pass for all oci deployment types.

chr-stian added 19 commits March 7, 2024 09:48
No-Issue
No-Issue
No-Issue
No-Issue
No-Issue
No-Issue
No-Issue
No-Issue
No-Issue
No-Issue
No-Issue
No-Issue
No-Issue
No-Issue
No-Issue
No-Issue
No-Issue
@chr-stian chr-stian merged commit a610a2c into ansible:master Mar 8, 2024
28 checks passed
@jerabekjiri jerabekjiri added the backport-4.9 This PR should be backported to stable-4.9 (2.4) label Apr 18, 2024
Copy link

patchback bot commented Apr 18, 2024

Backport to stable-4.9: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply a610a2c on top of patchback/backports/stable-4.9/a610a2c0dad431b3f3673f732826b151cabe3334/pr-2084

Backporting merged PR #2084 into master

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it:
    $ git remote add upstream https://github.com/ansible/galaxy_ng.git
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code:
    $ git fetch upstream
    $ git checkout -b patchback/backports/stable-4.9/a610a2c0dad431b3f3673f732826b151cabe3334/pr-2084 upstream/stable-4.9
  4. Now, cherry-pick PR gateway #2084 contents into that branch:
    $ git cherry-pick -x a610a2c0dad431b3f3673f732826b151cabe3334
    If it'll yell at you with something like fatal: Commit a610a2c0dad431b3f3673f732826b151cabe3334 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x a610a2c0dad431b3f3673f732826b151cabe3334
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR gateway #2084 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-4.9/a610a2c0dad431b3f3673f732826b151cabe3334/pr-2084
  7. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

jerabekjiri pushed a commit to jerabekjiri/galaxy_ng that referenced this pull request Apr 18, 2024
* increment galaxykit usage
No-Issue

(cherry picked from commit a610a2c)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-4.9 This PR should be backported to stable-4.9 (2.4) multi-commit
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants